From 6caaeb08738afac69d686d5e8eb0ee75a73f15cc Mon Sep 17 00:00:00 2001 From: oliskoli Date: Tue, 1 Aug 2006 23:06:39 +0000 Subject: [PATCH] Change testo sequence for stmsdf format and regenerate reference data. --- grtcirc.c | 2 +- reference/route/stmsdf-route.sdf | 60 +--- reference/stmsdf-example.gpx | 585 ------------------------------- reference/stmsdf.txt | 83 +++++ reference/track/stmsdf-track.sdf | 176 +++++----- stmsdf.c | 9 +- testo | 8 +- 7 files changed, 196 insertions(+), 727 deletions(-) delete mode 100644 reference/stmsdf-example.gpx create mode 100644 reference/stmsdf.txt diff --git a/grtcirc.c b/grtcirc.c index 16769e654..48c227b99 100644 --- a/grtcirc.c +++ b/grtcirc.c @@ -109,7 +109,7 @@ double heading( double lat1, double lon1, double lat2, double lon2 ) { double heading_true_degrees( double lat1, double lon1, double lat2, double lon2 ) { double h = 360.0 - DEG(heading(lat1, lon1, lat2, lon2)); - if (h > 360) h -= 360; + if (h >= 360.0) h -= 360.0; return h; } diff --git a/reference/route/stmsdf-route.sdf b/reference/route/stmsdf-route.sdf index b7ea01845..e6c0ab814 100644 --- a/reference/route/stmsdf-route.sdf +++ b/reference/route/stmsdf-route.sdf @@ -3,52 +3,16 @@ FILEVERSION=1 SOURCE=FILE DATUM=WGS84 TYPE=5 -DISTANCE=11206 -NAME=BELLEVUE +DISTANCE=394 +NAME=NARVA to Jahnstrasse [POINTS] -"WP","BELLEVUE",42.43095000,-71.10762800,23 -"WP","GATE6",42.43124000,-71.10923600,27 -"WP","PANTHRCAVE",42.43498000,-71.10994200,45 -"WP","6014MEADOW",42.43675700,-71.11322300,38 -"WP","6006",42.43901800,-71.11445600,56 -"WP","6006BLUE",42.43859400,-71.11480300,46 -"WP","5096",42.43891700,-71.11614600,45 -"WP","5066",42.43887800,-71.11927700,45 -"WP","5067",42.43922700,-71.11968900,58 -"WP","5058ROAD",42.43999300,-71.12092500,54 -"WP","5150TANK",42.44172700,-71.12167600,67 -"WP","5142",42.44390400,-71.12204400,51 -"WP","5144SUMMIT",42.44535900,-71.12284500,62 -"WP","5156",42.44729800,-71.12144700,128 -"WP","5148NANEPA",42.44976500,-71.12232000,120 -"WP","5258",42.45144200,-71.12174600,75 -"WP","5252PURPLE",42.45325600,-71.12121100,78 -"WP","527631",42.45625200,-71.11935600,79 -"WP","527614",42.45659200,-71.11967600,79 -"WP","5267OBSTAC",42.45738800,-71.11984500,74 -"WP","5278",42.45814800,-71.11913500,68 -"WP","5289",42.45937700,-71.11769300,64 -"WP","5374FIRE",42.46418300,-71.11982800,53 -"WP","5376",42.46565000,-71.11939900,56 -"WP","5376STREAM",42.46591300,-71.11932800,65 -"WP","6328",42.46711000,-71.11357400,54 -"WP","635722",42.46645900,-71.11006700,49 -"WP","635783",42.46655700,-71.10941000,49 -"WP","6373",42.46349500,-71.10711700,62 -"WP","BEAR HILL",42.46568700,-71.10736000,88 -"WP","6289",42.45998600,-71.10617000,73 -"WP","6297",42.45761600,-71.10511600,73 -"WP","6283",42.45384500,-71.10520600,67 -"WP","6280",42.45143000,-71.10541300,58 -"WP","6177",42.44844800,-71.10615800,62 -"WP","6176",42.44780400,-71.10662400,62 -"WP","6153",42.44477300,-71.10888200,63 -"WP","6171",42.44359200,-71.10630100,55 -"WP","6131",42.44298100,-71.11144100,64 -"WP","6130",42.44219600,-71.11097500,64 -"WP","6029",42.44175400,-71.11322000,56 -"WP","6006",42.43901800,-71.11445600,56 -"WP","6014MEADOW",42.43675700,-71.11322300,38 -"WP","PANTHRCAVE",42.43498000,-71.10994200,45 -"WP","GATE6",42.43124000,-71.10923600,27 -"WP","BELLEVUE",42.43095000,-71.10762800,23 +"WP","NARVA",50.49261597,12.10544807,391 +"WP","001",50.49260315,12.10543080,0 +"WP","002",50.49260315,12.10543080,0 +"WP","003",50.49427684,12.10513039,0 +"WP","004",50.49383394,12.10610052,0 +"WP","Liebknechtstrasse",50.49383403,12.10610026,0 +"WP","005",50.49383394,12.10610052,0 +"WP","006",50.49337562,12.10710450,0 +"WP","007",50.49365977,12.10715177,0 +"WP","Jahnstrasse",50.49366664,12.10715001,0 diff --git a/reference/stmsdf-example.gpx b/reference/stmsdf-example.gpx deleted file mode 100644 index 6e1543a35..000000000 --- a/reference/stmsdf-example.gpx +++ /dev/null @@ -1,585 +0,0 @@ - - - - - - - 23.000000 - BELLEVUE - - - 27.000000 - GATE6 - - - 45.000000 - PANTHRCAVE - - - 38.000000 - 6014MEADOW - - - 56.000000 - 6006 - - - 46.000000 - 6006BLUE - - - 45.000000 - 5096 - - - 45.000000 - 5066 - - - 58.000000 - 5067 - - - 54.000000 - 5058ROAD - - - 67.000000 - 5150TANK - - - 51.000000 - 5142 - - - 62.000000 - 5144SUMMIT - - - 128.000000 - 5156 - - - 120.000000 - 5148NANEPA - - - 75.000000 - 5258 - - - 78.000000 - 5252PURPLE - - - 79.000000 - 527631 - - - 79.000000 - 527614 - - - 74.000000 - 5267OBSTAC - - - 68.000000 - 5278 - - - 64.000000 - 5289 - - - 53.000000 - 5374FIRE - - - 56.000000 - 5376 - - - 65.000000 - 5376STREAM - - - 54.000000 - 6328 - - - 49.000000 - 635722 - - - 49.000000 - 635783 - - - 62.000000 - 6373 - - - 88.000000 - BEAR HILL - - - 73.000000 - 6289 - - - 73.000000 - 6297 - - - 67.000000 - 6283 - - - 58.000000 - 6280 - - - 62.000000 - 6177 - - - 62.000000 - 6176 - - - 63.000000 - 6153 - - - 55.000000 - 6171 - - - 64.000000 - 6131 - - - 64.000000 - 6130 - - - 56.000000 - 6029 - - - 56.000000 - 6006 - - - 38.000000 - 6014MEADOW - - - 45.000000 - PANTHRCAVE - - - 27.000000 - GATE6 - - - 23.000000 - BELLEVUE - - - - FILE - - - 1.000000 - - 0.000000 - 0.000000 - - - 0.000000 - - 342.600006 - 1.188000 - - - 0.000000 - - 92.400002 - 6.372000 - - - 0.000000 - - 115.599998 - 7.092000 - - - 0.000000 - - 113.800003 - 7.056000 - - - 0.000000 - - 109.000000 - 13.932000 - - - 0.000000 - - 130.100006 - 41.076000 - - - 0.000000 - - 147.399994 - 33.804001 - - - 0.000000 - - 127.199997 - 24.264000 - - - 0.000000 - - 149.100006 - 18.468000 - - - 0.000000 - - 189.100006 - 12.096000 - - - 0.000000 - - 265.299988 - 25.884001 - - - 0.000000 - - 229.899994 - 36.251999 - - - 0.000000 - - 250.000000 - 25.379999 - - - 0.000000 - - 323.000000 - 0.360000 - - - 2.000000 - - 118.699997 - 2.484000 - - - 0.000000 - - 165.800003 - 3.780000 - - - 1.000000 - - 117.500000 - 2.808000 - - - 0.000000 - - 81.000000 - 3.492000 - - - 0.000000 - - 92.000000 - 3.996000 - - - 0.000000 - - 59.000000 - 4.896000 - - - 0.000000 - - 55.799999 - 3.816000 - - - 2.000000 - - 47.000000 - 4.896000 - - - 1.000000 - - 52.799999 - 4.248000 - - - 1.000000 - - 29.500000 - 4.248000 - - - 0.000000 - - 356.299988 - 4.068000 - - - 2.000000 - - 353.200012 - 3.744000 - - - 0.000000 - - 346.000000 - 3.996000 - - - 0.000000 - - 334.299988 - 4.464000 - - - 0.000000 - - 0.000000 - 4.284000 - - - 0.000000 - - 328.100006 - 3.240000 - - - 0.000000 - - 359.000000 - 4.068000 - - - 6.000000 - - 346.399994 - 3.528000 - - - 2.000000 - - 168.500000 - 2.268000 - - - 0.000000 - - 166.699997 - 2.844000 - - - 0.000000 - - 184.500000 - 3.348000 - - - 0.000000 - - 250.600006 - 1.836000 - - - 0.000000 - - 274.100006 - 4.140000 - - - 1.000000 - - 283.299988 - 4.536000 - - - 0.000000 - - 297.600006 - 4.860000 - - - 0.000000 - - 348.200012 - 3.492000 - - - 6.000000 - - 26.299999 - 2.232000 - - - 0.000000 - - 218.000000 - 2.484000 - - - 0.000000 - - 161.000000 - 2.088000 - - - 0.000000 - - 137.899994 - 1.836000 - - - 0.000000 - - 116.300003 - 3.708000 - - - 0.000000 - - 118.400002 - 4.104000 - - - 0.000000 - - 97.300003 - 4.428000 - - - 0.000000 - - 93.300003 - 3.276000 - - - 0.000000 - - 140.600006 - 3.024000 - - - 0.000000 - - 162.699997 - 4.104000 - - - 0.000000 - - 163.300003 - 4.824000 - - - 0.000000 - - 163.300003 - 3.816000 - - - 0.000000 - - 163.000000 - 4.896000 - - - 0.000000 - - 215.399994 - 3.960000 - - - 0.000000 - - 229.699997 - 4.356000 - - - 7.000000 - - 226.100006 - 4.428000 - - - 0.000000 - - 227.699997 - 5.364000 - - - 0.000000 - - 230.100006 - 5.040000 - - - 0.000000 - - 255.600006 - 4.752000 - - - 0.000000 - - 256.700012 - 4.356000 - - - 0.000000 - - 281.000000 - 3.204000 - - - 0.000000 - - 329.600006 - 3.276000 - - - 0.000000 - - 316.500000 - 2.844000 - - - - diff --git a/reference/stmsdf.txt b/reference/stmsdf.txt new file mode 100644 index 000000000..1f345153d --- /dev/null +++ b/reference/stmsdf.txt @@ -0,0 +1,83 @@ +Grid Lat/Lon hddd°mm.mmm' +Datum WGS 84 + +Header Name Description Type Position Altitude Depth Proximity Temperature Display Mode Color Symbol Facility City State Country Date Modified Link Categories + +Waypoint 001 User Waypoint N50 29.56 E12 06.33 0 m Symbol & Name Unknown Waypoint +Waypoint 002 User Waypoint N50 29.56 E12 06.33 0 m Symbol & Name Unknown Waypoint +Waypoint 003 User Waypoint N50 29.66 E12 06.31 0 m Symbol & Name Unknown Waypoint +Waypoint 004 User Waypoint N50 29.63 E12 06.37 0 m Symbol & Name Unknown Waypoint +Waypoint 005 User Waypoint N50 29.63 E12 06.37 0 m Symbol & Name Unknown Waypoint +Waypoint 006 User Waypoint N50 29.60 E12 06.43 0 m Symbol & Name Unknown Waypoint +Waypoint 007 User Waypoint N50 29.62 E12 06.43 0 m Symbol & Name Unknown Waypoint +Waypoint Jahnstrasse User Waypoint N50 29.62 E12 06.43 0 m Symbol & Name Unknown Waypoint +Waypoint Liebknechtstrasse User Waypoint N50 29.63 E12 06.37 0 m Symbol & Name Unknown Waypoint +Waypoint NARVA User Waypoint N50 29.56 E12 06.33 391 m Symbol & Name Unknown Waypoint + + +Header Name Length Course Waypoints Link + +Route 394 m 46° true 10 waypoints + +Header Waypoint Name Distance Leg Length Course + +Route Waypoint NARVA 0 m +Route Waypoint 001 2 m 2 m 221° true +Route Waypoint 002 2 m 0 m 0° true +Route Waypoint 003 189 m 188 m 353° true +Route Waypoint 004 274 m 85 m 126° true +Route Waypoint Liebknechtstrasse 274 m 0 m 299° true +Route Waypoint 005 274 m 0 m 119° true +Route Waypoint 006 361 m 88 m 126° true +Route Waypoint 007 393 m 32 m 6° true +Route Waypoint Jahnstrasse 394 m 1 m 351° true + + +Header Name Start Time Elapsed Time Length Average Speed Link + +Track ACTIVE LOG 006 01/05/2005 15:02:47 0:33:09 653 m 1.2 kph + +Header Position Time Altitude Depth Leg Length Leg Time Leg Speed Leg Course + +Trackpoint N51 18.78 E12 24.79 01/05/2005 15:02:47 161 m 0.0 m +Trackpoint N51 18.77 E12 24.79 01/05/2005 15:03:25 154 m 0.0 m 8 m 0:00:38 0.8 kph 137° true +Trackpoint N51 18.77 E12 24.79 01/05/2005 15:03:39 148 m 0.0 m 3 m 0:00:14 0.8 kph 180° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:04:16 139 m 0.0 m 5 m 0:00:37 0.5 kph 129° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:05:02 145 m 0.0 m 2 m 0:00:46 0.2 kph 270° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:05:45 134 m 0.0 m 2 m 0:00:43 0.2 kph 90° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:06:44 131 m 0.0 m 6 m 0:00:59 0.4 kph 162° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:07:50 130 m 0.0 m 0 m 0:01:06 0 kph 0° true +Trackpoint N51 18.76 E12 24.80 01/05/2005 15:08:19 132 m 0.0 m 3 m 0:00:29 0.4 kph 180° true +Trackpoint N51 18.77 E12 24.80 01/05/2005 15:11:16 144 m 0.0 m 6 m 0:02:57 0.1 kph 342° true +Trackpoint N51 18.77 E12 24.81 01/05/2005 15:12:34 147 m 0.0 m 16 m 0:01:18 0.7 kph 38° true +Trackpoint N51 18.78 E12 24.83 01/05/2005 15:13:18 145 m 0.0 m 27 m 0:00:44 2 kph 70° true +Trackpoint N51 18.78 E12 24.83 01/05/2005 15:13:27 145 m 0.0 m 6 m 0:00:09 2 kph 0° true +Trackpoint N51 18.78 E12 24.83 01/05/2005 15:13:37 135 m 0.0 m 2 m 0:00:10 0.7 kph 90° true +Trackpoint N51 18.79 E12 24.83 01/05/2005 15:13:46 135 m 0.0 m 6 m 0:00:09 2 kph 0° true +Trackpoint N51 18.79 E12 24.83 01/05/2005 15:14:03 136 m 0.0 m 13 m 0:00:17 3 kph 17° true +Trackpoint N51 18.80 E12 24.84 01/05/2005 15:14:16 135 m 0.0 m 11 m 0:00:13 3 kph 32° true +Trackpoint N51 18.80 E12 24.84 01/05/2005 15:14:26 139 m 0.0 m 7 m 0:00:10 2 kph 117° true +Trackpoint N51 18.80 E12 24.85 01/05/2005 15:14:30 139 m 0.0 m 4 m 0:00:04 4 kph 90° true +Trackpoint N51 18.78 E12 24.88 01/05/2005 15:15:06 141 m 0.0 m 43 m 0:00:36 4 kph 126° true +Trackpoint N51 18.78 E12 24.89 01/05/2005 15:15:27 140 m 0.0 m 18 m 0:00:21 3 kph 121° true +Trackpoint N51 18.77 E12 24.90 01/05/2005 15:15:39 140 m 0.0 m 10 m 0:00:12 3 kph 128° true +Trackpoint N51 18.78 E12 24.90 01/05/2005 15:25:31 152 m 0.0 m 4 m 0:09:52 0.0 kph 33° true +Trackpoint N51 18.78 E12 24.90 01/05/2005 15:25:40 152 m 0.0 m 0 m 0:00:09 0 kph 0° true +Trackpoint N51 18.78 E12 24.90 01/05/2005 15:29:18 155 m 0.0 m 4 m 0:03:38 0.1 kph 328° true +Trackpoint N51 18.79 E12 24.87 01/05/2005 15:30:30 149 m 0.0 m 33 m 0:01:12 2 kph 311° true +Trackpoint N51 18.79 E12 24.87 01/05/2005 15:30:37 150 m 0.0 m 2 m 0:00:07 1.0 kph 270° true +Trackpoint N51 18.79 E12 24.87 01/05/2005 15:30:47 151 m 0.0 m 8 m 0:00:10 3 kph 270° true +Trackpoint N51 18.79 E12 24.86 01/05/2005 15:30:48 151 m 0.0 m 4 m 0:00:01 14 kph 270° true +Trackpoint N51 18.80 E12 24.83 01/05/2005 15:30:52 150 m 0.0 m 38 m 0:00:04 34 kph 300° true +Trackpoint N51 18.82 E12 24.80 01/05/2005 15:30:57 150 m 0.0 m 57 m 0:00:05 41 kph 315° true +Trackpoint N51 18.84 E12 24.77 01/05/2005 15:31:03 150 m 0.0 m 47 m 0:00:06 28 kph 316° true +Trackpoint N51 18.85 E12 24.75 01/05/2005 15:31:10 150 m 0.0 m 35 m 0:00:07 18 kph 314° true +Trackpoint N51 18.88 E12 24.57 01/05/2005 15:32:38 143 m 0.0 m 210 m 0:01:28 9 kph 283° true +Trackpoint N51 18.88 E12 24.57 01/05/2005 15:32:45 141 m 0.0 m 4 m 0:00:07 2 kph 270° true +Trackpoint N51 18.88 E12 24.57 01/05/2005 15:33:17 143 m 0.0 m 0 m 0:00:32 0 kph 0° true +Trackpoint N51 18.88 E12 24.57 01/05/2005 15:33:42 139 m 0.0 m 4 m 0:00:25 0.6 kph 270° true +Trackpoint N51 18.88 E12 24.56 01/05/2005 15:33:54 139 m 0.0 m 6 m 0:00:12 2 kph 270° true +Trackpoint N51 18.88 E12 24.56 01/05/2005 15:34:04 138 m 0.0 m 0 m 0:00:10 0 kph 0° true +Trackpoint N51 18.88 E12 24.56 01/05/2005 15:34:20 139 m 0.0 m 0 m 0:00:16 0 kph 0° true +Trackpoint N51 18.88 E12 24.56 01/05/2005 15:35:45 144 m 0.0 m 0 m 0:01:25 0 kph 0° true +Trackpoint N51 18.88 E12 24.56 01/05/2005 15:35:56 145 m 0.0 m 0 m 0:00:11 0 kph 0° true diff --git a/reference/track/stmsdf-track.sdf b/reference/track/stmsdf-track.sdf index 16fec8fe0..1d5f4f51e 100644 --- a/reference/track/stmsdf-track.sdf +++ b/reference/track/stmsdf-track.sdf @@ -3,89 +3,97 @@ FILEVERSION=1 SOURCE=FILE DATUM=WGS84 TYPE=28 -NAME= -MINALT=1 -MAXALT=7 -MAXSPEED=11.41 -DISTANCE=7663 -DURATION=7176 -DATE=25.05.2002 19:06.21 -AVGSPEED=1.07 +NAME=ACTIVE LOG 006 +MINALT=130 +MAXALT=161 +MAXSPEED=11.42 +DISTANCE=653 +DURATION=1989 +DATE=01.05.2005 15:02.47 +AVGSPEED=0.33 [POINTS] -"TP",25.05.2002,19:06.21,30.062183,-91.610350,1,0.00,0.0,0 -"TP",25.05.2002,19:09.55,30.062783,-91.610567,0,0.33,342.6,69.987322 -"TP",25.05.2002,19:12.00,30.062700,-91.608267,0,1.77,92.4,291.772212 -"TP",25.05.2002,19:12.48,30.062333,-91.607383,0,1.97,115.6,386.232694 -"TP",25.05.2002,19:14.41,30.061533,-91.605283,0,1.96,113.8,607.290028 -"TP",25.05.2002,19:17.16,30.059783,-91.599400,0,3.87,109.0,1206.639952 -"TP",25.05.2002,19:17.46,30.057800,-91.596683,0,11.41,130.1,1549.068041 -"TP",25.05.2002,19:18.20,30.055383,-91.594900,0,9.39,147.4,1868.294705 -"TP",25.05.2002,19:19.01,30.053883,-91.592617,0,6.74,127.2,2144.464886 -"TP",25.05.2002,19:20.46,30.049733,-91.589750,0,5.13,149.1,2682.736085 -"TP",25.05.2002,19:21.10,30.049017,-91.589883,0,3.36,189.1,2763.464558 -"TP",25.05.2002,19:21.51,30.048800,-91.592933,0,7.19,265.3,3058.347425 -"TP",25.05.2002,19:22.35,30.046233,-91.596450,0,10.07,229.9,3501.639022 -"TP",25.05.2002,19:23.08,30.045517,-91.598717,0,7.05,250.0,3734.175753 -"TP",25.05.2002,20:04.23,30.047300,-91.600267,0,0.10,323.0,3982.577357 -"TP",25.05.2002,20:06.04,30.047000,-91.599633,2,0.69,118.7,4052.201483 -"TP",25.05.2002,20:07.06,30.046433,-91.599467,0,1.05,165.8,4117.314967 -"TP",25.05.2002,20:08.18,30.046200,-91.598950,1,0.78,117.5,4173.480978 -"TP",25.05.2002,20:10.20,30.046367,-91.597733,0,0.97,81.0,4292.216099 -"TP",25.05.2002,20:11.09,30.046350,-91.597167,0,1.11,92.0,4346.788930 -"TP",25.05.2002,20:12.18,30.046783,-91.596333,0,1.36,59.0,4440.500254 -"TP",25.05.2002,20:14.22,30.047450,-91.595200,0,1.06,55.8,4572.531980 -"TP",25.05.2002,20:15.04,30.047800,-91.594767,2,1.36,47.0,4629.618556 -"TP",25.05.2002,20:16.14,30.048250,-91.594083,1,1.18,52.8,4712.404057 -"TP",25.05.2002,20:17.01,30.048683,-91.593800,1,1.18,29.5,4767.784474 -"TP",25.05.2002,20:18.07,30.049350,-91.593850,0,1.13,356.3,4842.190720 -"TP",25.05.2002,20:19.51,30.050317,-91.593983,2,1.04,353.2,4950.596840 -"TP",25.05.2002,20:20.39,30.050783,-91.594117,0,1.11,346.0,5004.054457 -"TP",25.05.2002,20:21.24,30.051233,-91.594367,0,1.24,334.3,5059.639210 -"TP",25.05.2002,20:22.17,30.051800,-91.594367,0,1.19,0.0,5122.757362 -"TP",25.05.2002,20:23.18,30.052217,-91.594667,0,0.90,328.1,5177.442115 -"TP",25.05.2002,20:24.37,30.053017,-91.594683,0,1.13,359.0,5266.511051 -"TP",25.05.2002,20:28.13,30.054867,-91.595200,6,0.98,346.4,5478.391223 -"TP",25.05.2002,20:31.36,30.053733,-91.594933,2,0.63,168.5,5607.222276 -"TP",25.05.2002,20:32.56,30.053183,-91.594783,0,0.79,166.7,5670.130771 -"TP",25.05.2002,20:34.02,30.052633,-91.594833,0,0.93,184.5,5731.545746 -"TP",25.05.2002,20:36.03,30.052450,-91.595433,0,0.51,250.6,5792.842562 -"TP",25.05.2002,20:36.48,30.052483,-91.595967,0,1.15,274.1,5844.426835 -"TP",25.05.2002,20:37.52,30.052650,-91.596783,1,1.26,283.3,5925.219917 -"TP",25.05.2002,20:39.18,30.053133,-91.597850,0,1.35,297.6,6041.240521 -"TP",25.05.2002,20:40.15,30.053617,-91.597967,0,0.97,348.2,6096.285922 -"TP",25.05.2002,20:41.25,30.053967,-91.597767,6,0.62,26.3,6139.752934 -"TP",25.05.2002,20:42.37,30.053617,-91.598083,0,0.69,218.0,6189.200692 -"TP",25.05.2002,20:44.01,30.053200,-91.597917,0,0.58,161.0,6238.299244 -"TP",25.05.2002,20:45.53,30.052817,-91.597517,0,0.51,137.9,6295.772963 -"TP",25.05.2002,20:46.54,30.052567,-91.596933,0,1.03,116.3,6358.549677 -"TP",25.05.2002,20:47.42,30.052333,-91.596433,0,1.14,118.4,6413.318154 -"TP",25.05.2002,20:48.41,30.052250,-91.595683,0,1.23,97.3,6486.172417 -"TP",25.05.2002,20:49.52,30.052217,-91.595017,0,0.91,93.3,6550.449724 -"TP",25.05.2002,20:50.49,30.051883,-91.594700,0,0.84,140.6,6598.568036 -"TP",25.05.2002,20:52.14,30.051050,-91.594400,0,1.14,162.7,6695.698291 -"TP",25.05.2002,20:52.56,30.050567,-91.594233,0,1.34,163.3,6751.821900 -"TP",25.05.2002,20:53.38,30.050183,-91.594100,0,1.06,163.3,6796.448283 -"TP",25.05.2002,20:55.11,30.049100,-91.593717,0,1.36,163.0,6922.529370 -"TP",25.05.2002,20:56.32,30.048450,-91.594250,0,1.10,215.4,7011.261354 -"TP",25.05.2002,20:57.24,30.048083,-91.594750,0,1.21,229.7,7074.430288 -"TP",25.05.2002,20:58.40,30.047500,-91.595450,7,1.23,226.1,7168.033689 -"TP",25.05.2002,20:59.28,30.047067,-91.596000,0,1.49,227.7,7239.672577 -"TP",25.05.2002,21:00.22,30.046633,-91.596600,0,1.40,230.1,7315.017121 -"TP",25.05.2002,21:01.41,30.046400,-91.597650,0,1.32,255.6,7419.467107 -"TP",25.05.2002,21:02.48,30.046233,-91.598467,0,1.21,256.7,7500.358795 -"TP",25.05.2002,21:03.43,30.046317,-91.598967,0,0.89,281.0,7549.438075 -"TP",25.05.2002,21:04.49,30.046783,-91.599283,0,0.91,329.6,7609.589519 -"TP",25.05.2002,21:05.57,30.047133,-91.599667,0,0.79,316.5,7663.322053 +"TP",01.05.2005,15:02.47,51.312938,12.413165,161,0.00,0.0,0 +"TP",01.05.2005,15:03.25,51.312883,12.413248,154,0.22,136.9,8.478119 +"TP",01.05.2005,15:03.39,51.312855,12.413248,148,0.22,180.0,11.566578 +"TP",01.05.2005,15:04.16,51.312827,12.413304,139,0.13,128.7,16.521235 +"TP",01.05.2005,15:05.02,51.312827,12.413276,145,0.04,270.0,18.457564 +"TP",01.05.2005,15:05.45,51.312827,12.413304,134,0.05,90.0,20.393893 +"TP",01.05.2005,15:06.44,51.312772,12.413332,131,0.11,162.6,26.865457 +"TP",01.05.2005,15:07.50,51.312772,12.413332,130,0.00,0.0,26.865457 +"TP",01.05.2005,15:08.19,51.312744,12.413332,132,0.11,180.0,29.963246 +"TP",01.05.2005,15:11.16,51.312799,12.413304,144,0.04,342.7,36.443717 +"TP",01.05.2005,15:12.34,51.312911,12.413443,147,0.20,38.0,52.143218 +"TP",01.05.2005,15:13.18,51.312994,12.413804,145,0.61,69.7,78.925927 +"TP",01.05.2005,15:13.27,51.313049,12.413804,145,0.69,0.0,85.112175 +"TP",01.05.2005,15:13.37,51.313049,12.413832,135,0.19,90.0,87.042662 +"TP",01.05.2005,15:13.46,51.313105,12.413832,135,0.69,0.0,93.219581 +"TP",01.05.2005,15:14.03,51.313216,12.413887,136,0.76,17.4,106.182252 +"TP",01.05.2005,15:14.16,51.313299,12.413971,135,0.84,32.0,117.119734 +"TP",01.05.2005,15:14.26,51.313272,12.414054,139,0.66,118.0,123.688361 +"TP",01.05.2005,15:14.30,51.313272,12.414110,139,0.97,90.0,127.555149 +"TP",01.05.2005,15:15.06,51.313049,12.414610,141,1.19,125.4,170.241955 +"TP",01.05.2005,15:15.27,51.312966,12.414832,140,0.86,121.0,188.281604 +"TP",01.05.2005,15:15.39,51.312911,12.414943,140,0.82,128.6,198.174693 +"TP",01.05.2005,15:25.31,51.312938,12.414971,152,0.01,32.1,201.819955 +"TP",01.05.2005,15:25.40,51.312938,12.414971,152,0.00,0.0,201.819955 +"TP",01.05.2005,15:29.18,51.312966,12.414943,155,0.02,327.9,205.465216 +"TP",01.05.2005,15:30.30,51.313160,12.414582,149,0.46,310.7,238.629832 +"TP",01.05.2005,15:30.37,51.313160,12.414554,150,0.28,270.0,240.560315 +"TP",01.05.2005,15:30.47,51.313160,12.414443,151,0.77,270.0,248.293911 +"TP",01.05.2005,15:30.48,51.313160,12.414387,151,3.87,270.0,252.160708 +"TP",01.05.2005,15:30.52,51.313327,12.413915,150,9.43,299.5,289.898474 +"TP",01.05.2005,15:30.57,51.313688,12.413332,150,11.42,314.7,347.021422 +"TP",01.05.2005,15:31.03,51.313994,12.412860,150,7.88,316.0,394.311899 +"TP",01.05.2005,15:31.10,51.314216,12.412498,150,5.04,314.6,429.569729 +"TP",01.05.2005,15:32.38,51.314633,12.409554,143,2.39,282.8,639.630841 +"TP",01.05.2005,15:32.45,51.314633,12.409499,141,0.55,270.0,643.491682 +"TP",01.05.2005,15:33.17,51.314633,12.409499,143,0.00,0.0,643.491682 +"TP",01.05.2005,15:33.42,51.314633,12.409443,139,0.15,270.0,647.358356 +"TP",01.05.2005,15:33.54,51.314633,12.409360,139,0.48,270.0,653.161283 +"TP",01.05.2005,15:34.04,51.314633,12.409360,138,0.00,0.0,653.161283 +"TP",01.05.2005,15:34.20,51.314633,12.409360,139,0.00,0.0,653.161283 +"TP",01.05.2005,15:35.45,51.314633,12.409360,144,0.00,0.0,653.161283 +"TP",01.05.2005,15:35.56,51.314633,12.409360,145,0.00,0.0,653.161283 [CUSTOM1] -0,1 -3583,2 -3717,1 -4123,2 -4193,1 -4240,1 -4410,2 -4912,6 -5115,2 -5491,1 -5704,6 -6739,7 +0,161 +38,154 +52,148 +89,139 +135,145 +178,134 +237,131 +303,130 +332,132 +509,144 +587,147 +631,145 +640,145 +650,135 +659,135 +676,136 +689,135 +699,139 +703,139 +739,141 +760,140 +772,140 +1364,152 +1373,152 +1591,155 +1663,149 +1670,150 +1680,151 +1681,151 +1685,150 +1690,150 +1696,150 +1703,150 +1791,143 +1798,141 +1830,143 +1855,139 +1867,139 +1877,138 +1893,139 +1978,144 +1989,145 diff --git a/stmsdf.c b/stmsdf.c index ae7311327..a793e9f2c 100644 --- a/stmsdf.c +++ b/stmsdf.c @@ -95,8 +95,8 @@ static int opt_route_index_value; static arglist_t stmsdf_args[] = { - {"index", &opt_route_index, "Index of route (if more the one in source)", - "1", ARGTYPE_INT, "1", NULL }, + { "index", &opt_route_index, + "Index of route (if more the one in source)", "1", ARGTYPE_INT, "1", NULL }, ARG_TERMINATOR }; @@ -410,10 +410,9 @@ calculate(const waypoint *wpt, double *dist, double *speed, double *course, time_t time; - *course = 360 - DEG(heading( + *course = heading_true_degrees( RAD(trkpt_out->latitude), RAD(trkpt_out->longitude), - RAD(wpt->latitude), RAD(wpt->longitude))); - if (*course >= 360) *course -= 360; + RAD(wpt->latitude), RAD(wpt->longitude)); *dist = radtometers(gcdist( RAD(trkpt_out->latitude), RAD(trkpt_out->longitude), diff --git a/testo b/testo index a27baef72..5799ee616 100755 --- a/testo +++ b/testo @@ -1094,11 +1094,11 @@ compare ${TMPDIR}/sportsim.txt ${REFERENCE}/track/sportsim-sample.txt # Suunto SDF # rm -f ${TMPDIR}/stmsdf* -${PNAME} -i gpx -f ${REFERENCE}/expertgps.gpx -r -o stmsdf -F ${TMPDIR}/stmsdf-route.sdf -t -o stmsdf -F ${TMPDIR}/stmsdf-track.sdf -compare ${TMPDIR}/stmsdf-route.sdf ${REFERENCE}/route/stmsdf-route.sdf +${PNAME} -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -t -o stmsdf -F ${TMPDIR}/stmsdf-track.sdf -r -o stmsdf,index=2 -F ${TMPDIR}/stmsdf-route.sdf compare ${TMPDIR}/stmsdf-track.sdf ${REFERENCE}/track/stmsdf-track.sdf -${PNAME} -i stmsdf -f ${TMPDIR}/stmsdf-route.sdf -f ${TMPDIR}/stmsdf-track.sdf -o gpx -F ${TMPDIR}/stmsdf-example.gpx -compare ${TMPDIR}/stmsdf-example.gpx ${REFERENCE}/stmsdf-example.gpx +compare ${TMPDIR}/stmsdf-route.sdf ${REFERENCE}/route/stmsdf-route.sdf +${PNAME} -i stmsdf -f ${TMPDIR}/stmsdf-track.sdf -f ${TMPDIR}/stmsdf-route.sdf -o garmin_txt,prec=2 -F ${TMPDIR}/stmsdf.txt +compare ${TMPDIR}/stmsdf.txt ${REFERENCE}/stmsdf.txt exit 0 -- 2.30.2